Merged.
authoremellor@ewan <emellor@ewan>
Mon, 10 Oct 2005 15:16:41 +0000 (16:16 +0100)
committeremellor@ewan <emellor@ewan>
Mon, 10 Oct 2005 15:16:41 +0000 (16:16 +0100)

Trivial merge